From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 30 May 2011 16:09:29 +0000 (-0700)
Subject: * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3610
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f513d92a9614bbbee3eced04aced320c0f804139;p=emacs.git

* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cd62cae923f..9d40df670b3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
+
 	* eval.c (Qdebug): Now static.
 	* lisp.h (Qdebug): Remove decl.  This reverts a part of the
 	2011-04-26 change (bzr 104015) that inadvertently undid part of
diff --git a/src/alloc.c b/src/alloc.c
index 3f7bed571c7..8215cc53cd3 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -993,13 +993,11 @@ lisp_align_malloc (size_t nbytes, enum mem_type type)
   free_ablock = free_ablock->x.next_free;
 
 #if GC_MARK_STACK && !defined GC_MALLOC_CHECK
-  if (val && type != MEM_TYPE_NON_LISP)
+  if (type != MEM_TYPE_NON_LISP)
     mem_insert (val, (char *) val + nbytes, type);
 #endif
 
   MALLOC_UNBLOCK_INPUT;
-  if (!val && nbytes)
-    memory_full ();
 
   eassert (0 == ((uintptr_t) val) % BLOCK_ALIGN);
   return val;